debian: move to a stage1 build

diff --git a/debian/control b/debian/control
index c0373993c67b8cb029d41677d465aa801a328cd2..6ffadf373fc173f5a0c2d5a521a94ae103f77d51 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,9 +11,9 @@ Build-Depends: debhelper (>= 9.20141010),
                pkg-config,
                cmake,
                git,
-               cargo (>= 0.7.0) <stage2>,
-               python-dulwich <!stage2>,
-               python-pytoml <!stage2>,
+               cargo (>= 0.7.0) <!stage0>,
+               python-dulwich,
+               python-pytoml,
                ca-certificates,
                bash-completion,
                libhttp-parser-dev,

diff --git a/debian/rules b/debian/rules
index 171defa87de39f0a3f9d96ca44b18a3779e777e2..f104769578dd84547e9afd576f925b65a4533bc6 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -29,11 +29,7 @@ override_dh_auto_configure:
        ./debian/cargo-vendor-pack.py
 
 override_dh_auto_build:
-ifneq ($(filter stage2,$(DEB_BUILD_PROFILES)),)
-       ln -s `which cargo` $(CURDIR)/cargo-stage0
-       # Workaround for https://github.com/rust-lang/cargo/issues/1423
-       mv $(DEPSDIR) $(CURDIR)/.deps
-else
+ifneq ($(filter stage0,$(DEB_BUILD_PROFILES)),)
        # Bootstrap cargo stage0
        ./debian/bootstrap.py \
                --no-clean \
@@ -48,6 +44,10 @@ else
        # Workaround for https://github.com/rust-lang/cargo/issues/1423
        mv $(DEPSDIR) $(CURDIR)/.deps
        ln -s `find $(CURDIR)/.deps -name 'cargo-*' -type f -executable` $(CURDIR)/cargo-stage0
+else
+       ln -s `which cargo` $(CURDIR)/cargo-stage0
+       # Workaround for https://github.com/rust-lang/cargo/issues/1423
+       mv $(DEPSDIR) $(CURDIR)/.deps
 endif
        # Configure to build cargo using the just-built stage0
        ./configure \